resolve conflicts

[网络] 解决冲突;化解矛盾;解决抵触